Make slightly more C++ friendly.

diff --git a/gpsbabel/queue.c b/gpsbabel/queue.c
index 1cb6e6efb4f94c2eb01d72aef5e65b6d8dcf7828..db3c56e6ef147cbd6e621667e727a77dff1eae0d 100644 (file)
--- a/gpsbabel/queue.c
+++ b/gpsbabel/queue.c
@@ -22,12 +22,12 @@
 #include "queue.h"
 
 void
-enqueue(queue *new, queue *old)
+enqueue(queue *new_el, queue *old)
 {
-       new->next = old->next;
-       new->prev = old;
-       old->next->prev = new;
-       old->next = new;
+       new_el->next = old->next;
+       new_el->prev = old;
+       old->next->prev = new_el;
+       old->next = new_el;
 }
 
 queue *

diff --git a/gpsbabel/queue.h b/gpsbabel/queue.h
index 84bce2a5620ab9d7f196566e46e7b529fdc8f807..b6b46bceb05063530e4e680a76e66271c951085c 100644 (file)
--- a/gpsbabel/queue.h
+++ b/gpsbabel/queue.h
@@ -24,7 +24,7 @@ typedef struct queue {
        struct queue *prev;
 } queue;
 
-void enqueue(queue *new, queue *old);
+void enqueue(queue *new_el, queue *old);
 queue * dequeue(queue *element);
 
 #define QUEUE_INIT(head) (head)->next = (head)->prev = head

diff --git a/gpsbabel/route.c b/gpsbabel/route.c
index 8a8ea03fc87c0d485056b1b93479fbceff786aa0..dac5c4909fdebabf72595e27d98d31b9abd7e0b8 100644 (file)
--- a/gpsbabel/route.c
+++ b/gpsbabel/route.c
@@ -33,7 +33,7 @@ route_head *
 route_head_alloc(void)
 {
        route_head *rte_head;
-       rte_head = xcalloc(sizeof (*rte_head), 1);
+       rte_head = (route_head *) xcalloc(sizeof (*rte_head), 1);
        QUEUE_INIT(&rte_head->Q);
        return rte_head;
 }